bitkeeper revision 1.1159.1.306 (418225cdXsKP_d8tfJvM9TR5Vjv5_Q)

Manual merge.

diff --cc .rootkeys
Simple merge

diff --cc README
index 517e0b55db2d5524112fda21d6836896e7833a5e,0a2f5412b149c191a737d637aeb0855791b5b839..4c45d4407eec729654e9205a20dd1b392d5515cc
--- 1/README
--- 2/README
+++ b/README
@@@ -8,9 -8,9 +8,10 @@@ __  __            ____    __
  ###############################
  
  University of Cambridge Computer Laboratory
 -28 Oct 2004
 +28 October 2004
  
- http://www.cl.cam.ac.uk/netos/xen
++http://www.cl.cam.ac.uk/netos/xen/
+ http://www.cl.cam.ac.uk/netos/xen/
  
  About the Xen Virtual Machine Monitor
  =====================================

diff --cc docs/src/user.tex
index 5b3d256984325ec375aaf032f53017db6067c4f4,e7265afff22cc5ef92dc4cd9d22d86fa33d67ea7..194de9ae389fff75f77bf4fa4231dc5435d9d120
--- 1/docs/src/user.tex
--- 2/docs/src/user.tex
+++ b/docs/src/user.tex
@@@ -1,6 -1,7 +1,7 @@@
  \documentclass[11pt,twoside,final,openright]{xenstyle}
 -\usepackage{a4,graphicx,setspace}
 +\usepackage{a4,graphicx,setspace,times}
  \setstretch{1.15}
+ %\input{style.tex}
  
  \begin{document}
  
@@@ -183,13 -236,19 +184,13 @@@ information along with pointers to pape
  
  Xen has since grown into a project in its own right, enabling us to
  investigate interesting research issues regarding the best techniques
- for virtualizing resources such as the CPU, memory, disk and network.
+ for virtualising resources such as the CPU, memory, disk and network.
  The project has been bolstered by support from Intel Research
  Cambridge, and HP Labs, who are now working closely with us.
 -% We're also in receipt of support from Microsoft Research Cambridge to
 -% port Windows XP to run on Xen.
 -
 -Xen was first described in the 2003 paper at SOSP \\
 -({\tt http://www.cl.cam.ac.uk/netos/papers/2003-xensosp.pdf}).
 -The first public release of Xen (1.0) was made in October 2003.  Xen
 -was developed as a research project by the University of Cambridge
 -Computer Laboratory (UK).  Xen was the first Virtual Machine Monitor
 -to make use of {\em paravirtualisation} to achieve near-native
 -performance virtualisation of commodity operating systems.  Since
 +
 +Xen was first described in the 2003 paper at SOSP\footnote{\tt
 +http://www.cl.cam.ac.uk/netos/papers/2003-xensosp.pdf}, and the
 +first public release (1.0) was made in October 2003.  Since
  then, Xen has been extensively developed and is now used in production
  scenarios on multiple sites.